From: Adam Borowski <kilobyte@angband.pl>
Date: Sun, 12 Jul 2020 16:46:44 +0000 (+0100)
Subject: Properly detect x32.
X-Git-Tag: archive/raspbian/2%0.159.2999+git296494a-2+rpi1~1^2~1
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=9033bad71da3583eae0c96fbf0277b834fa38066;p=x264.git

Properly detect x32.

As usually, x32 gets mistaken for amd64 (both are x86-64 ABIs after all).
This version doesn't use any assembly yet, a proper port is needed.

Gbp-Pq: Name properly_detect_x32.patch
---

diff --git a/common/common.h b/common/common.h
index 0a8ae95..c3cf0b8 100644
--- a/common/common.h
+++ b/common/common.h
@@ -800,7 +800,7 @@ static ALWAYS_INLINE int x264_predictor_clip( int16_t (*dst)[2], int16_t (*mvc)[
     return cnt;
 }
 
-#if ARCH_X86 || ARCH_X86_64
+#if ARCH_X86 || ARCH_X86_64 || ARCH_X32
 #include "x86/util.h"
 #endif
 
diff --git a/configure b/configure
index 56a8b7b..377d413 100755
--- a/configure
+++ b/configure
@@ -720,6 +720,10 @@ esac
 
 LDFLAGS="$LDFLAGS $libm"
 
+case `$CC -dumpmachine` in
+    *gnux32) host_cpu=x32
+esac
+
 stack_alignment=4
 case $host_cpu in
     i*86)
@@ -776,6 +780,10 @@ case $host_cpu in
             ASFLAGS="$ASFLAGS -f elf64"
         fi
         ;;
+    x32)
+        ARCH="X32"
+        CFLAGS="$CFLAGS -fPIC"
+        ;;
     powerpc*)
         ARCH="PPC"
         if [ $asm = auto ] ; then